Merge "Set EDITED column to USER_EDITED when editing APN" am: 90d284cab7 am: 1b0c8335e3
am: 50f5d8cf66

Change-Id: Icda2b822986167cbe3afa5f56955e946bb576315