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

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

Change-Id: I6506f7dfd3aa80fa5eec2f3b0bc8ec415aae37ad