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: 48036751 am: 9f42f7b8

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



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