Merge "Keyguard should wait before restarting FP auth after successful FP auth" into oc-dr1-dev
am: 192e7ccf45

Change-Id: Ib77387825e02f7579783e0a9e23f5e9d4b7ed537