Merge "Fix brightness change during rotation when playing HDR videos." into...

Merge "Fix brightness change during rotation when playing HDR videos." into tm-dev am: a0292d14 am: 5f5f81f4 am: 3ed291ca am: eb97f4f3

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



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