Merge "Fixed a race condition when preferred transport updated" am: 0fb999e7

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



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