Merge "Fix night display activation behavior after reboot" into oc-dev
am: bd75ee0015

Change-Id: I6c8002fc4ac63f27343a27148c6a18e349a6b883