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

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

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

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



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