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

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1205274

Change-Id: I34c590d0ea20ceb7abaede2febde37816ae78d4f