[automerger skipped] Merge "Deflake Lockscreen Clock Screenshot Tests" into...

[automerger skipped] Merge "Deflake Lockscreen Clock Screenshot Tests" into tm-qpr-dev am: 0b6c884d am: 33da7c42 -s ours

am skip reason: Merged-In Ifaa060a1212331756ad412f1e6027c140fa35921 with SHA-1 9d6e679a is already in history

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



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