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

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



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