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

Merge "Merge "Fixed cutout flicker in C10, P10" into tm-dev am: 5a9d90c1 am: 95060444 am: a3ca4a6e" into tm-qpr-dev-plus-aosp am: 8d5d1c31

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



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