Merge "Rollback @SystemApi on ApnSetting" am: f36f5590ac

Change-Id: I61ae73c8afa40f29b8adb5838fe620dc17198ef0