[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: b2a718f62f
-s ours am: 999977ff27
-s ours
am skip reason: Change-Id I8070de79a83350d1658efcb19e983669dad0e673 with SHA-1 8d47205577
is in history
Change-Id: I46a089cf5653c6699a6ad8636823d0750ad0fe9b
This commit is contained in: