Merge "PhoneStateListener msim improvement"