[automerger skipped] Merge "DO NOT MERGE Update the stable display frame for...

[automerger skipped] Merge "DO NOT MERGE Update the stable display frame for flexible insets" into rvc-qpr-dev am: 530bebf0 am: 86a94de6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Ic5114fc8259ad5de622d44f66c4d9326238cf371