Merge "Revert "Add TEST_MAPPING for android.platform.test.scenario.biometrics""