Merge "Fix cutout not updating when switching cutout emulation" into tm-qpr-dev am: 58de71a4

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



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