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 am: c42d48c0

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



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