[automerger skipped] Merge "Hide HDR output control feature behind feature...

[automerger skipped] Merge "Hide HDR output control feature behind feature flag." into udc-dev am: fcb2bb51 -s ours

am skip reason: Merged-In I4209b0dbba7570ee850b2a9fda7b4af31d1f70ed with SHA-1 4a9cc910 is already in history

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



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