[automerger skipped] Merge "cameraserver: fix deadlock scenario in...

[automerger skipped] Merge "cameraserver: fix deadlock scenario in torchModeStatusChanged callback." am: 2658976c am: 49c350e5 am: daeafed0 am: 0a027778 am: 2c0c472a -s ours

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

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

Change-Id: I940233a3e2ff4095e2f858e762b86c5bad1f9707