Merge changes from topic "PSL_TelephonyCallback" am: 456069019e am: 0a1acbbcd3

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic26eea861f33d75b7b5ef62aa411532e52cac51b