Merge "Not unlocking phone on the test start" into ub-launcher3-qt-qpr1-dev
am: 872a380b59

Change-Id: I6e0831a2660459803eef6c755e4fcfc9f414c94f