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

Merge "[automerger skipped] Merge "Validate userId when publishing shortcuts" into rvc-dev am: 72aee140 am: fedf1c8c am: 4934f58c am: 782e7bc3 am: 4a0b42a7 am: 63fe378e am: fc03b8aa am: 9c067171 -s ours am: a1dea848 -s ours am: 779520e0 -s ours am: 2dc6a399 -s ours" into udc-qpr-dev-plus-aosp