Merge "[Telephony] PhoneStateListener redesign for new event" am: 3521a14be4 am: 26c225c0ed

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic283ea7e43bd3a2875acb5528f19ded0974ae42e