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

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



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