Merge "HDR video fix" into sc-dev am: 8330256deb am: d6f82a5b5d

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

Change-Id: Id971c4f5a18ec3b8483f401b0f963e30eab2f704