Merge "Merge "Merge "[automerger skipped] Merge "RESTRICT AUTOMERGE: CTS for [Prevent shortcut info package name spoofing]" into nougat-mr1-cts-dev am: 88eb5511bd  -s ours" into oreo-cts-dev am: 4a7891232d  -s ours" into oreo-mr1-cts-dev am: 0954d22726  -s ours" into pie-cts-dev