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

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



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