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

Merge "Fixed cutout flicker in C10, P10" into tm-dev am: 5a9d90c1 am: 5242f1ac am: 8ea7f414 am: aef364b8

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



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