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

Change-Id: I959e4cc4f252b1a503dca11d83672257b93f97a4