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

Change-Id: Ib9e3312110548ade5108cac0a7c8b3324b6bc2c2