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

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



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