Merge "Handle interaction between minimal post processing and HDR output...

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

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



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