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: 533b2ca1

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



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