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

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



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