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: 04159e7a

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



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