Merge \"Fix flashlight dim state\" into nyc-dev
am: 817c4ca6d4

Change-Id: Ie49b1d3daaffe3f31bde760c1b8ed8391e82771f