Merge "Remove the "set network type" when radio on" into sc-qpr1-dev am:...

Merge "Remove the "set network type" when radio on" into sc-qpr1-dev am: 9b46d940 am: f4d4d8dd am: 647ef6c0

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

Change-Id: Ie2eb2ca4cf8687d74b0e6add8f30d9f0e5afb882