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: 07d60475 am: b6a7a983

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

Change-Id: I240bfd0bfcd77244839d8b3ab00832f5c065479b