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

Change-Id: I23f87d541771baa7ba3e5857999a5e5c96c301ce