[automerger skipped] Merge "Fix deadlock between UiccController and...

[automerger skipped] Merge "Fix deadlock between UiccController and UiccProfile" am: 989232c4 am: 0064fc03 -s ours am: f07cd309 -s ours am: 9b4802ae -s ours

am skip reason: Merged-In I1f46b5e1cf5b76ac674eacd09ee9352bb8ba9291 with SHA-1 e21efbfd is already in history

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

Change-Id: Ib7d0918adba8fa7569851143d987d910eb25a65a