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

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

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



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