Merge changes from topic "PSL_TelephonyCallback" am: f619c9967d am: df270afdb6

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic26eea861f33d75b7b5ef62aa411532e52cac51b
tree: 9aed371a622ddcea4e171a3a5d4d03829b89fcb2
  1. core/
  2. framework/
  3. service/
  4. services/
  5. tests/
  6. OWNERS