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

[automerger skipped] Merge changes from topics "getApnTypeString", "qns_switched_pref" am: f24f9a73 am: 77961f0e -s ours am: 7cf118b8 -s ours

am skip reason: Merged-In I6122721ea74530457a4cbe7d535262780bf2e031 with SHA-1 f573f45a is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1763676

Change-Id: Ibb405d3349adea1bb6eec64114bd2a65ff7f3398