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

Change-Id: I9a26ee54d34c6a3ca8251f9f6fc34f281af58587