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

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



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