Merge changes from topic "PSL_TelephonyCallback" am: e2e358f666

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idd41c34f9e4dff1ca7930a9fc2a6f06ec8c316ba
tree: af79e55296ace2cfaaf3532c727e5c847ac07811
  1. framework/
  2. service/
  3. OWNERS