Merge "Specify the desired callback type to deflake the tests" into android14-tests-dev