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

Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 8afead69 am: 7de4f696 am: 6282a984 am: c441fd50

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



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