[automerger skipped] Merge changes from topics "getApnTypeString", "qns_switched_pref" am: ef140360c3 am: c57a926bbe -s ours am: 5ec3ce814d -s ours am: 9ae13b4b84 -s ours

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

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

Change-Id: Ia6915df8cb3f80e191cff75fc68fa532def1524f
This commit is contained in:
Jack Yu
2021-07-13 17:45:14 +00:00
committed by Automerger Merge Worker

Diff Content Not Available