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: 9fb3b860 am: ee9a8673 am: 7376ff8e

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



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