Merge "Camera: Avoid possible deadlock during R&C updates" into tm-dev am:...

Merge "Camera: Avoid possible deadlock during R&C updates" into tm-dev am: 255c3d90 am: c2e07a6d am: 6aeabdef am: d876b5d6

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



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