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

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

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