[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: 999977ff -s ours am: 3b07b650 -s ours

am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d472055 is in history

Change-Id: I39acb8ea42ddfaabf0adac49b3e8ebb70c535451