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

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



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