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

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

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