Merge "Merge "Remove internal ApnSetting." into pi-dev-plus-aosp am: 1969c54ae2"