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

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



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