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

Change-Id: I75716bb0276341928252419f13558eda755c6891