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

Change-Id: I56c76b69d457714fac17b7f8d28f5d1437cce698