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

Change-Id: Ic6772c2b65d98c78863c5e9b60e7c1ac1cc714cb