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

Change-Id: I1bd1a28595417ad06fcf548678870a1e5adfc092