Merge "Add Brightness setting for VR Mode." into nyc-mr2-dev
am: cfdf27f24b

Change-Id: I1edc922f659f83f36102a3e6d3e36e2a6f74716f