Merge "Prevent face auth from running again after a successful unlock when assistant is active." into tm-qpr-dev