Merge "PhoneStateListener msim improvement"
am: ec7a701aa6

Change-Id: I9eeef5afafe6d3bfdaa745021af01717a3956f7a