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

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



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