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

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

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