Merge "Merge "Revert "Ignoring the cut out"" into android12L-tests-dev am: 7fc7b92d63" into android13-tests-dev