[automerger skipped] Merge "PhoneStateListener msim improvement" am: ec7a701aa6
am: 20b6c2408a -s ours
am skip reason: change_id I4b014e00528a1f05e0b5f237229c561f8260e2bd with SHA1 d5deeb15e9 is in history

Change-Id: I309f61ec84ceeafcba815518377fb9414659b830