Merge "Merge "Update keyguard fingerprint & face scanning colors" into udc-dev am: b50b3f418c" into udc-mainline-prod