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

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



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