[automerger skipped] Merge "Rescind BAL privilege when ShortcutService sends the callback PI" into udc-dev am: 4c452c359c am: 3135208164 -s ours am: cd4a8db7e4 -s ours

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

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

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