[automerger skipped] Merge "Validate userId when publishing shortcuts" into...

[automerger skipped] Merge "Validate userId when publishing shortcuts" into rvc-dev am: 72aee140 am: fedf1c8c am: 4934f58c am: 782e7bc3 am: 4a0b42a7 am: 63fe378e am: 2828a742 am: fb722bc9 am: d0e0fd4e -s ours

am skip reason: Merged-In Idbde676f871db83825155730e3714f3727e25762 with SHA-1 01bfd04f is already in history

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



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