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

Change-Id: I0cba7c11df0d18e50ed454a7da26255db7a5b4cb