Merge "[CTS] Add a delay to reduce the flakiness" into android12-tests-dev