Merge changes from topic "am-f9a3bb8903ef43da82d1d195f2be598b" into android12-tests-dev

* changes:
  Merge "[automerger skipped] Merge "Apply proper displayCutout rotation in density 480 dpi and 270 degrees rotation." into android10-tests-dev am: a13af898 -s ours" into android11-tests-dev am: bc4aa9d3
  [automerger skipped] Merge "Apply proper displayCutout rotation in density 480 dpi and 270 degrees rotation." into android10-tests-dev am: a13af898 -s ours am: 28fa90e2 -s ours