[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: 135d77ae -s ours am: 56a95edb -s ours am: 49a1aebd -s ours

am skip reason: subject contains skip directive

Change-Id: I7f70c1be276a716e2cb7f345221177d7c3a8c4f0