Merge "Fixed cutout flicker in C10, P10" into tm-dev am: 5a9d90c1

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



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