Merge "Display.getHdrCapabilities.getSupportedHdrTypes returns the current...

Merge "Display.getHdrCapabilities.getSupportedHdrTypes returns the current mode's supported HDR types" into udc-dev am: 7c41d8e4 am: 44a81085

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



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