Merge "Merge "Fix KeepClearRectsTests if there are existing areas onscreen" into android13-tests-dev am: 7bf48d7f58"