Merge "CameraService: Update camera and torch state lists also at runtime" am: 900596ac1e
am: 5eeb6b1e43

Change-Id: Ie7decb502cbe7b0e6ac0f4aa5d8b82615d32de34