Merge "Fixed a race condition when preferred transport updated" into tm-dev...

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

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



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