Merge "Optionally use fingerprint virtual hal eith BiometricTestSession" into main