[automerger skipped] Merge "Rollback @SystemApi on ApnSetting" am: f36f5590...
[automerger skipped] Merge "Rollback @SystemApi on ApnSetting" am: f36f5590 am: 139fb3e1 -s ours
am skip reason: Change-Id Ifc781ae494968fbaad8c591dbd990d397e0d733b with SHA-1 d8b1c8b2 is in history
Change-Id: Iae63509b34649123fe8b1ec503405eba0e5db0d9