Merge "[Telephony] PhoneStateListener redesign - cts test in PhoneStateListenerTest"