Test: I solemnly swear I tested this conflict resolution. run cts --module CtsNativeTestCases Change-Id: I4c8764a00d30ab7ff94eff07870ec79c7d7bc67d