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: 3d509c60 am: 470113e4

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

Change-Id: I90510a2135818dbec1702b22f1b16b8b7124ebb7