Merge "[automerger skipped] Merge "Rescind BAL privilege when ShortcutService...

Merge "[automerger skipped] Merge "Rescind BAL privilege when ShortcutService sends the callback PI" into udc-dev am: 4c452c35 am: d432d793 am: 3ef223de -s ours" into udc-qpr-dev-plus-aosp am: 48570b4b -s ours

am skip reason: Merged-In I2df9de272192c9a149a9ff519c96e6e0e8304040 with SHA-1 eb904695 is already in history

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



Change-Id: Ie9cdd96b031032c3f344fb8da6facfbc9f1353fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>