[automerger skipped] Merge changes from topics "getApnTypeString",...

[automerger skipped] Merge changes from topics "getApnTypeString", "qns_switched_pref" am: ef140360 am: c57a926b -s ours am: 5ec3ce81 -s ours

am skip reason: Merged-In Ia79bb9eaa1fc43a2995730da47289274f94d67fe with SHA-1 6930ca1e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1763946

Change-Id: Ic4a7194a8b62319da24564e7dbde10c904de20cb