[automerger skipped] [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback am: 4fff45499f am: a4a9372351 am: a22d9d466d -s ours

am skip reason: Change-Id I0fdd7fc3c3d67310197862c84d02f30164ec80d1 with SHA-1 0b1d5c1f10 is in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1614979

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I648359598a68211afddfea29d22fed40f9a2d957