Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 2b35e45c18

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

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