Merge "Fix KeepClearRectsTests if there are existing areas onscreen" into android13-tests-dev