Merge "Fix the issue of screen flashing when adjusting ambient light when...

Merge "Fix the issue of screen flashing when adjusting ambient light when playing HDR video." into main am: 7eb3839f am: 0bb6a26f

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3505711



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