Merge "Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock." into rvc-qpr-dev am: 5fc17f2fae

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

Change-Id: I10315aec4a263581eee7734cae2745544cfc2577