Merge "Use alternative PhoneStateListener formal API" am: 45f58ae930 am: b0faafbcbc am: 5611936630

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib176dcbf9d2d60f3f7393e50d765f296a83b77ce