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: f1e96deb am: 5e755150 am: b88e55dc

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



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