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

Change-Id: I63139d266461878a666527bd1798f621b1278bf6