[automerger skipped] [PhoneStateListener] Redesign PhoneStateListener: Use...

[automerger skipped] [PhoneStateListener] Redesign PhoneStateListener: Use TelephonyCallback am: 4fff4549 am: a4a93723 am: a22d9d46 -s ours am: 82e4957d -s ours

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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4b2b34f158eadb518c7fb250214520c270ad88d