[automerger skipped] Merge "Account for cutouts in system insets (as done...

[automerger skipped] Merge "Account for cutouts in system insets (as done previously)" into rvc-qpr-dev am: a03cd95a am: b4431aaf -s ours

am skip reason: Change-Id I75554224171e1e6a32892db53e0243c38a7b5169 with SHA-1 f95fad04 is in history

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

Change-Id: I7161bcb1cfca735848e7d497321c65dfe3de22e7