Merge "Force Software Rendering for KeyguardClockFrame" into udc-qpr-dev am:...

Merge "Force Software Rendering for KeyguardClockFrame" into udc-qpr-dev am: 8d9f729a am: 6a01267c

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



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