Merge "Fix cts failures of DisplayCutoutTests" into android13-tests-dev