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

Merge "Camera: Sync non-perf. class characteristics" into udc-dev am: 9673b3f1 am: 5f736c41 am: 7479a9d5 am: a17c197b

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



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