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

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

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



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