[automerger skipped] Merge "[Settings] Reduce CDMA API access when not...

[automerger skipped] Merge "[Settings] Reduce CDMA API access when not required" into tm-qpr-dev am: 147669c8 am: b079eb62 -s ours

am skip reason: Merged-In I5c74636d8418a379724676e1f854c8adff5d4387 with SHA-1 86b80b25 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20893163



Change-Id: I38ca99e7b53d4605815af6550ca66d4936574032
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>