Merge "Camera: Sync non-perf. class characteristics" into udc-dev am:...

Merge "Camera: Sync non-perf. class characteristics" into udc-dev am: 9673b3f1 am: f26a17bd am: 29364d6d am: 1b1f2c1f

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



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