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

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



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