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

Change-Id: Ia4100787507887692c6aa5df4e331fba59993255