Merge "RESTRICT AUTOMERGE: CTS for [Prevent shortcut info package name spoofing]" into nougat-mr1-cts-dev