Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 3f78e374

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



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