Merge "Add public ApnSetting in android.telephony."
am: f9063b378b

Change-Id: I6608e1666b3e078f3b5786638e9050a2d2d3b762