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: I6a3e6788cb674579e1a22315490d2ad5232a2a76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>