Merge \"Add NightDisplaySettingsActivity\" into nyc-mr1-dev
am: 53e9f35239

Change-Id: If6f1f681fa5e1fb8fd1319054fce76fd8472f1c5