Merge "Fix disappearing biometric prompt for the managed profile" into rvc-dev am: 4d44702659

Change-Id: Ifef1e319dacc0d12c4ae7d162d221daa0a342597