[automerger skipped] Merge "Fixed a race condition when preferred transport...

[automerger skipped] Merge "Fixed a race condition when preferred transport updated" am: 0fb999e7 am: 43aa49de am: 0045a9a3 -s ours am: a49280a2 -s ours am: dd35cf62 -s ours am: 732ebf2a -s ours

am skip reason: Merged-In Id856902c9a73942913e041dc5396b5d17b661089 with SHA-1 e1d96937 is already in history

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



Change-Id: Ief67a7dae3d77cace22899ad64624ceceb131d9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>