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

Change-Id: Ic3261feb6da09e6c04e9af096642869e8bf69a40