Merge "Fix brightness change during rotation when playing HDR videos." into tm-dev am: a0292d14

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



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