Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part4" am: 479e40e5ed am: ad94e9f5ca

Original change: https://android-review.googlesource.com/c/platform/packages/services/Telephony/+/1614541

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic01fbe194a1380ef08c9c98fc6272aa30f55d105