Merge "Remove internal ApnSetting."
am: b4e44257a4

Change-Id: I7dad553477ddcffaa77ad3f326a898d772217cbb