[automerger skipped] Merge "[Telephony] Use TelephonyCallback instead of PhoneStateListener part5" am: 9abf2bff3b
am: 6003cb977f
am: 9988792138
-s ours
am skip reason: Change-Id I52af54045872bbf13e64d5d94c8b027ec702abb9 with SHA-1 ea29704e40
is in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1620520
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I6bfec84b83d21d8950058007bb378f292f743dc7
This commit is contained in: