Merge "Force Software Rendering for KeyguardClockFrame" into udc-dev am: 999f9e4560 am: 5e387e908b

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

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