[automerger skipped] Merge changes from topic "PSL_TelephonyCallback" am:...

[automerger skipped] Merge changes from topic "PSL_TelephonyCallback" am: 45606901 am: 0a1acbbc am: 4a8217ab -s ours am: 58b44299 -s ours

am skip reason: Change-Id Ia3b777b12142b104b5798804f50b34748f9bf28c with SHA-1 2f5aa10d is in history

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0a316c605d68e255f27df3148e1a71592723d1c7