Merge "CameraService: Notify flashlight about device close" into nyc-mr1-dev am: bb8526358b
am: cdb35bb0c0

Change-Id: I03c8727228078d5892e8f563a96e9dfafea3fb9e