Merge "Camera: Create links to mandatory stream combinations" into udc-dev am:...

Merge "Camera: Create links to mandatory stream combinations" into udc-dev am: caa08c2c am: 6a18ce99 am: 5d05d4fa am: 9e5fc5c2

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



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