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

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

Change-Id: I7d9b3b150d0d90b1b6edcd199f7e9454a0b00a8d