[automerger skipped] Merge "Fix the synchronization pattern in...

[automerger skipped] Merge "Fix the synchronization pattern in IccSmsInterfaceManager." am: 8076cbee am: c0d2d3e7 am: 69fbaf82 am: dcce143c -s ours

am skip reason: Change-Id I1831070e87d8ef2d49c690e263b6d3b280015353 with SHA-1 e650b495 is in history

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

Change-Id: I0f0dfcba98ebd97913ee52a2f82f9469dc9b43e9