Merge "Validate userId when publishing shortcuts" into rvc-dev am: 72aee140 am: fedf1c8c

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



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