Merge "Set EDITED column to USER_EDITED when editing APN"
am: 90d284cab7

Change-Id: I32cb408436e755e6452dacafc3dc5808f5a2a60d