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