resolve merge conflicts of 01d30534ffe347c5069fc36096b257e800fb8d0b to android12L-tests-dev

Original change: https://android-review.googlesource.com/c/platform/cts/+/2063874

Bug: 229633546

Change-Id: I5e97da2b892e9f5557c34357a044719f40c2655c
1 file changed