Merge "Keyguard should authenticate with FP even after getting valid FP" into oc-dev am: 4ea09f5ca4
am: 54b5b6d710

Change-Id: Ic865f205b44d3ba1b851b571a69b97c7a393a958