Merge "Use alternative PhoneStateListener formal API" am: 5d0529e6d0 am: e42b9b2b4d am: 639ab78ded

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

Change-Id: I8c3099149b7b21c93efe7bda78f8330223092544