Merge "cameraserver: fix deadlock scenario in torchModeStatusChanged callback." am: 2658976c6d am: 49c350e533

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

Change-Id: Ib179ab7abd4956f32c4e8366d32a1199b229abed