Merge "Use alternative PhoneStateListener formal API" am: 73e1c90697 am: 181827f862 am: 5611936630

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib176dcbf9d2d60f3f7393e50d765f296a83b77ce
tree: 9b3c42a9cbc0592b359b78d4bceaf34ea3d8aa99
  1. framework/
  2. service/
  3. OWNERS