Merge "Camera: Gate API0/P010 only Jpeg/R composite stream" into udc-dev am: 7a04fefe

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



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