Merge "Merge "Fix CTS failures for CUTOUT" into android12L-tests-dev am: 71e86c74c9" into android13-tests-dev am: 1e7fd8e167 am: df506b6df3

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

Change-Id: I7ce0a1a2fa09d26e198dba6652878a0ddd5938cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>