Merge "Fix broken and flaky VTS tests" into android12-tests-dev