[automerger skipped] Merge "Transition to current state on preferred network...

[automerger skipped] Merge "Transition to current state on preferred network type changed" am: be75c2e3 am: a69cef6c -s ours

am skip reason: Merged-In Icbfb0c01bc9bed61a9e31779e982b365fd11b21e with SHA-1 460e56d8 is already in history

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

Change-Id: I7fb926e5092c6f200bf8ce2b781729a225f0731b