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: 5d61fd08 am: 039f75ef

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



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