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

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



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