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

Change-Id: I9c93dd2d8a4e1e13a47f2f1a838ff00909947a00