Merge "Unlock screen before test runs." into tm-dev am: 62b46c6409 am: a49299b667

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17546406

Change-Id: I81e194050bb87495dcde920d8fd115cbfcd50480
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>