[automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part4" am: 479e40e5ed am: ad94e9f5ca am: 62bffca7a3 -s ours am: 2bc19d7d06 -s ours

am skip reason: Change-Id Ica74875c6ee3c5e0901e19cc878dd8aa9042d350 with SHA-1 5ec326b56e is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I058440b1b4fc3f3776e5de065a14a1e430888b87