Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 2b35e45c am: 6f74739d

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



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