Merge "Make sure display config is updated when cutout is changed" into tm-dev am: 25319431

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



Change-Id: I83c8cfe3a299ad42d4839ea439247b57372c2860
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>