Merge "[automerger skipped] Merge "Remove internal ApnSetting." am: 4079677883 am: 1fc6859126  -s ours am: 5b255c9cbc  -s ours"