Merge "Remove experimental twilight-based automatic brightness" into nyc-mr2-dev am: 1f56b60981
am: 2d93a66f47  -s ours

Change-Id: I687fc15866a7e34f1e92d3cd0180cabb40995b14