[automerger skipped] Merge "Remove the "set network type" when radio on" am:...

[automerger skipped] Merge "Remove the "set network type" when radio on" am: 5713dce7 am: 72e86274 am: 61617922 -s ours

am skip reason: Merged-In I932cf8a7e7df7aeee4fb195b72c5bfabdc790d44 with SHA-1 befefb11 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1815094

Change-Id: I60236d76f4f5d0d0cd30b306389279712aae9ec3