[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be...

[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332 -s ours am: 10caf51f -s ours am: 5f2520f6 -s ours am: b2a718f6 -s ours am: d4fd92c5 -s ours am: 3bc2ed97 -s ours

am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 077dd9b0 is in history

Change-Id: Ib8a9454ea4f36aa6955e2cd99ec630ce819f2776