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

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



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