[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: 3b07b65009
-s ours am: 65f2bf3070
-s ours
am skip reason: subject contains skip directive Change-Id: I7eadaceab63edc8b55a484856051599fec45e353
This commit is contained in: