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

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

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