[automerger skipped] Merge changes from topic "PSL_TelephonyCallback" am: f619c9967d am: df270afdb6 am: 868044d483 -s ours

am skip reason: Change-Id Ia3b777b12142b104b5798804f50b34748f9bf28c with SHA-1 78ca2ba3a7 is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifaaf86e06bbd93df2b0d5265df41e055f6be9bad