Merge "Revert "Add biometric scuba tests to presubmit.""