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

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



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