Merge "Show cdma network mode choices" into main am: 392f07f4 am: 5a979e94

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



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