[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours am: 10caf51f27
-s ours am: 5f2520f685
-s ours
am skip reason: subject contains skip directive Change-Id: Icbe574512461d49be73aaca3a3d94779a2017bf4
This commit is contained in: