Merge "Fix cutout flicker while switch screen resolution" into tm-dev am: 842704d4 am: 8e0cd33a am: 9f11ec63 am: c532f5e2

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



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