Merge "Deflake Lockscreen Clock Screenshot Tests" into tm-qpr-dev am: 0b6c884d

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



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