Merge "Use alternative PhoneStateListener formal API" am: 4de7d07302 am: 6f12370cfc

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2071765aba00d8520d3715831d267bcd35795d43