[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: 65f2bf30 -s ours

am skip reason: subject contains skip directive

Change-Id: I7eadaceab63edc8b55a484856051599fec45e353