commit a13987ec73699cb4a33a451605d45c3c18ccc3bd
author Jordan Liu <jminjie@google.com> Mon Jan 08 13:38:38 2018 -0800
committer android-build-team Robot <android-build-team-robot@google.com> Thu Feb 08 04:12:28 2018 +0000
tree cab7ee728fad207ba03a3294f33ea92486d5a669
parent 09a4b06010a777e26020d884712291f5af577883

Do not overwrite carrier/user edits with UNEDITED

The EDITED field stores the edit history of the APN, so if an APN
conflicts with an existing APN then when merging we should preserve the
EDITED field of the existing APN when the new APN is set to UNEDITED.

Bug: 68841424
Test: CarrierSettingsUpdater/.../ApnUpdaterTest.java
Change-Id: I25757c31f9b3a2f2cece0aaae95451a0e33d0903
Merged-In: I25757c31f9b3a2f2cece0aaae95451a0e33d0903
(cherry picked from commit 58cbcd9400cdc0006fc5f595ac7326caa6db43dd)