Merge "CameraService: Fix missing torch state callback" am: 5a80267cc4
am: 28c5bca5a9

Change-Id: I2942facaf5b979d86ac3ae89c449730b5581b818