[automerger skipped] Merge "cameraserver: fix deadlock scenario in torchModeStatusChanged callback." am: 2658976c6d am: 49c350e533 am: daeafed023 am: 0a0277782e am: 2c0c472a2f -s ours

am skip reason: Merged-In Id95a2aa061b6cb4db4a25b1a2aa6a390f898af87 with SHA-1 46ef0f509f is already in history

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

Change-Id: I940233a3e2ff4095e2f858e762b86c5bad1f9707