Merge "Merge "Fix fingerprint error messages on Keyguard / AOD" into oc-mr1-dev am: db25b9fb am: a0bbacbe"