Merge "Revert "Make sure display config is updated when cutout is changed""...

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

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



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