Merge "Fix AnomalyDetectionTests" into android13-tests-dev