[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 -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: Ieae39d1aa201e470af964144029f493050a5937c