[automerger skipped] Merge "Revert "Advertise support for BT709 in the WSI""...

[automerger skipped] Merge "Revert "Advertise support for BT709 in the WSI"" into tm-dev am: 140bbb3a am: 34e34d3f -s ours

am skip reason: Merged-In I9ad64d7d8b21cd68c071dc90f7d032671096b0da with SHA-1 192ad4a7 is already in history

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

Change-Id: I4c842a27c3e01aff720c80a073defbaf2a2e5385