Merge "Camera: Disable composite Jpeg/R support in case of Hal support" into...

Merge "Camera: Disable composite Jpeg/R support in case of Hal support" into udc-dev am: da09e8ad am: 35a3f650

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



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