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

[automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff am: 6003cb97 am: 99887921 -s ours am: 0872d40a -s ours

am skip reason: Change-Id I52af54045872bbf13e64d5d94c8b027ec702abb9 with SHA-1 ea29704e is in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7ebbb6f675ec25e6c09f46e874ae1e24da1c8728