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

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



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