Merge \"Add SETTINGS_CONDITION_NIGHT_DISPLAY\" into nyc-mr1-dev
am: 1e6e1ffeaa

Change-Id: I0204b25d35585c39ebea8ab797f00e1c027b86c5