Merge "[Telephony] PhoneStateListener redesign"