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

Change-Id: If0df54f19b6eee4975c378e2ec647c76387df93e