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