Merge "Use alternative PhoneStateListener formal API" am: 5d0529e6d0

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

Change-Id: If80a6359b6570b5c99fcb1a5ace13f3599e5fc0d