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: 2b0333d1 am: 5969b75a am: e21e76ee

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



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