Merge "Remove the SDR type from list returned by GetSupportedHdrOutputTypes" into udc-dev am: af4430a7 am: 1bfe7cb2

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



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