Merge "Camera: Avoid recursive deadlock during device state changes" into sc-v2-dev am: 4c123df4

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

Change-Id: I68bc43b23f0e0d5d9907bf5657a279cb53f89dfe