Merge "Fix fingerprint error messages on Keyguard / AOD" into oc-mr1-dev