[automerger skipped] Merge "[Telephony] PhoneStateListener redesign for new...

[automerger skipped] Merge "[Telephony] PhoneStateListener redesign for new event" am: 3521a14b am: 26c225c0 am: 3ed50cfe -s ours

am skip reason: Change-Id Id89a541745fb8700e1ebd2cc162ee55cd1055661 with SHA-1 6ec57124 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ie6f0633a65848fedc28d52bbb686dbfbf27a0cca