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: 653b143a am: cca367ae

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



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