[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
am: f5543f6661
-s ours
am skip reason: subject contains skip directive Change-Id: I6028dbcb3e3b37ed6febf2cba912eee03961b5ed
This commit is contained in: