Merge "Validate userId when publishing shortcuts" into rvc-dev am: 72aee14094 am: fedf1c8c14 am: 4934f58cc8 am: 782e7bc3e2

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

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