[automerger skipped] Merge "RESTRICT AUTOMERGE Allow LockScreenPattern to be launched in the pinning screen" into qt-dev am: 5e788604c2
am: fe302e4867
-s ours am: 6708ebae6d
am: bde8ce85e0
am: 31b91d9a9f
Change-Id: Iff3e56d49b9efca9f5a26a84e331d025aefc7583
This commit is contained in: