Merge \"Back up Night Light settings\" into nyc-mr1-dev
am: 9a0e444c22

Change-Id: I4bc968dfced4671fecb140c50ce759b02d78c4a1