Merge "Camera: Use characteristic from user app for extension" into udc-dev am: 2b956fe2 am: 0c92700a

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



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