Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 8afead698e

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/interfaces/+/25548794

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