Merge "Fix WindowInsetsLayoutTests & DisplayCutoutTests for waterfall" into android11-tests-dev