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

[automerger skipped] Merge "Fix the synchronization pattern in IccSmsInterfaceManager." into rvc-qpr-dev-plus-aosp am: 152ac326 -s ours

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

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

Change-Id: I8b397414b41c4e2d6518e3c8cb169b6dd22fa81e