Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 8afead69 am: 54aff2d5

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



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