Merge "Fix cutout not updating when switching cutout emulation" into...

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

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



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