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

Change-Id: Id7b23cd947afaba4fbdf9bccaeaf355ef3ae1c1e