Merge "Fix testPulledAnomalyDetection" into android12-tests-dev