[automerger skipped] Merge "Fixed deadlock in IccSmsInterfaceManager" am:...
[automerger skipped] Merge "Fixed deadlock in IccSmsInterfaceManager" am: 4a81a980 am: 9ea95749 am: c62168e9 -s ours
am skip reason: Change-Id I1f59f8af2134fb5e8b205dec0f728b29e24cbe5f with SHA-1 d34750b6 is in history
Change-Id: Iad8655e45afbabef9f9cf3e535c97f34a9c50cc0