Merge "Fix cutout flicker while switch screen resolution" into tm-dev am: 842704d4

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



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