[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: 751daad079
am: c79de6aa02
Change-Id: Iff1d356ffa298954e86b0687133617f24e374a8b
This commit is contained in: