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

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



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