[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into pi-dev am: f2754332a0
-s ours
am skip reason: subject contains skip directive Change-Id: I26c2fcfc1c38818d168667d1121a0cde3018c566
This commit is contained in: