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

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



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