[automerger skipped] Merge "Don't transition to current state after changing...

[automerger skipped] Merge "Don't transition to current state after changing preferred network mode" am: af220aef am: 7836bdc3 am: d0d707c1 am: fceaa0d9 -s ours

am skip reason: Change-Id If18dea68bd64d5330324d63ba9d270ac875f82c3 with SHA-1 65529f7e is in history

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

Change-Id: Id5f54305e2ad9bc0093de2499cf1e1274e7c665a