Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Backport CTS for [Prevent shortcut info package name spoofing]" into oreo-cts-dev am: 22c718419d  -s ours" into oreo-mr1-cts-dev