Merge "ClearBiometricRecognized when user switches" into rvc-dev am: 4cf90e8a am: e2ad1cf0 am: 259ee30a Change-Id: Ie2ea86101ef8538ca8f0a9f33b494d331bca6530