Merge "Disable "Night Light" mode while in VR mode." into nyc-mr1-dev am: 23af4ec04b
am: 23be015407

Change-Id: Ia96a18258aa92fc300830bcb7c954f14d2b12a44