Merge "Camera: Fix mandatory stream combination links" into udc-dev am: 2b35e45c18 am: dfbcee0e4f am: 0791b9cc79 am: 2f1ec581f2

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

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