Merge "Provide color override path through keyguard preview renderer" into...

Merge "Provide color override path through keyguard preview renderer" into udc-dev am: 082e2eeb am: 684b6a76

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



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