[automerger skipped] Merge "Force Software Rendering for KeyguardClockFrame"...

[automerger skipped] Merge "Force Software Rendering for KeyguardClockFrame" into udc-dev am: 999f9e45 am: ddd0ab0d -s ours

am skip reason: Merged-In I8e1ea0769bdba27e880eea642176fdd2c25bfca4 with SHA-1 89a0ae60 is already in history

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



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