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: 95060444 am: 74896bc1 am: 8c9a39b7

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



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