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