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 am: 497e8b87

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

Change-Id: Ie5da72e5a9d9e41191479a626bcd06fd325d402a