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

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

Change-Id: I68179c806ec6424d92a029795db2b174e10f4022