Merge "Use HdrConversionMode FORCE with preferredHdrType INVALID for a casee...

Merge "Use HdrConversionMode FORCE with preferredHdrType INVALID for a casee when SDR FORCE conversion is chosen." into udc-dev am: a3079eee

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



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