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

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

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