Merge \"Add Settings#ACTION_NIGHT_DISPLAY_SETTINGS\" into nyc-mr1-dev
am: c8c60f5930

Change-Id: Idea9e5fdc4b54cb287ce1d82fdac75ef4bb95750