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

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



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