Merge "Improve logging for NightDisplayService/TwilightService" into nyc-mr1-dev am: ee36020457 am: d64ec9b709
am: e489d3c03c

Change-Id: Icfa0097c578c54ce26beb548bbf4af04ddc88a8a