Merge "Transition to current state on preferred network type changed" into...

Merge "Transition to current state on preferred network type changed" into sc-dev am: d7e9c850 am: a6aa08d1

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

Change-Id: I5214c9a0defb1a473c5e784943f4c773feb73a08