Merge "Update keyguard fingerprint & face scanning colors" into udc-dev am:...

Merge "Update keyguard fingerprint & face scanning colors" into udc-dev am: b50b3f41 am: 0fd1cd36

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



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