[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
Change-Id: I6503f9e76785858f5a0b17e4699f8ebd38f75787
This commit is contained in: