Merge "Make NightDisplayService robust to early alarms" into nyc-mr1-dev
am: 609770d34b

Change-Id: I6d297a3e1714cff39b904fa9a7881e86a1c5c201