[automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of...

[automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part2" am: 47cce2a6 am: c650702c am: 3a3f0d5d -s ours am: def0c437 -s ours

am skip reason: Change-Id I7cd1dd4503e6bdf1bd73a720b75136cb336297b9 with SHA-1 fb697876 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/1614959

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I121e45663f43b71ba71b354881c5a0ab392a0f78