Merge "Handle interaction between minimal post processing and HDR output control" into udc-dev am: 79e56488de

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

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