Merge "ITS: use manual request for tests with repeated 3a if available" into android13-tests-dev