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