[automerger skipped] Merge "Remove internal ApnSetting." am: b4e44257a4 am: 97bcb87a8d  -s ours
am: a4f8bd036a  -s ours

Change-Id: Icf4b4843c0f39d71c3499226b57dc7c4df421a2f