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

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



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