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

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: 2721e6e8

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



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