Merge "enable FP auth when assistant is showing and device is locked"