[automerger skipped] Merge "Fix race condition when TelephonyRegistry handles...

[automerger skipped] Merge "Fix race condition when TelephonyRegistry handles multi-SIM config change" am: 19e53cfd am: 4ce464c7 -s ours am: 85ad3a6e -s ours am: be36c9a7 -s ours

am skip reason: Merged-In I31506a07406dee424546bfe4927e069280a7b011 with SHA-1 80b47e83 is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107190



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