Merge "Expose COLOR_MODE_DISPLAY_BT2020." am: ab88d5cac3 am: f0588b06e0

Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/2322455

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