Merge "Remove internal ApnSetting."
am: 4079677883

Change-Id: I130a2038c2c5b289c107d9e640c038965ef60e34