Merge "Fix for failing CtsBiometricsTestCases for older devices. This is to add assumeTrue() followed by b/204347712 in testSimpleBiometricAuth_convenience()" into android12L-tests-dev