Merge "Camera: Fix deadlock caused by ordering of mStatusLock and mCameraStatesLock." am: 9fb67351a9 am: bd8b8c172c am: a0020f9af7 am: c894f7ffde am: 38272a36b0

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

Change-Id: I1cf355d46116ca071a0e86449fa67bbfcba0af08