Merge "[CTS] Fix CTS failure in mainline train" into android13-tests-dev