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

Change-Id: I7fded40f84985919bf58a549fe59b2510f9ef5f3