[automerger skipped] Merge "Backport Prevent shortcut info package name spoofing" into oc-dev am: c6dbcc137e am: dcc95b94f8 am: ab3235ad5b am: 5fb8ac2010
am: 97238d791f  -s ours

Change-Id: Icf3a98f193be43b1b82e88c2ec88fe1aa3f33093