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

Change-Id: I84b1b8f943e55a151c25616a766445eb6bb2e5a2