[automerger skipped] Merge "NetworkTypeController only transition to state if...

[automerger skipped] Merge "NetworkTypeController only transition to state if new state is different" am: 0547b844 am: 535503ae -s ours am: aa8c40f3 -s ours

am skip reason: Change-Id I6d6bccab24c76ba0aee508351be960e390d874af with SHA-1 96aac65a is in history

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

Change-Id: Iade649bfa2776b03cdab7712a322062b61c27c8c