[automerger skipped] Merge "Fix race condition when TelephonyRegistry handles multi-SIM config change" am: 19e53cfdc8 am: 4ce464c70b -s ours
am skip reason: Merged-In I31506a07406dee424546bfe4927e069280a7b011 with SHA-1 80b47e83f6 is already in history
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2107190
Change-Id: I2067e4f88e0db53db04e29faf085dd83e01efae4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: