Merge "Fixed a race condition when preferred transport updated" into tm-dev am: ab6586ce

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



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