Merge "DO NOT MERGE Revert "Add Brightness setting for VR Mode."" into nyc-mr2-dev
am: cbb057d3da

Change-Id: I2c4f83b83dfa685c8b838b9206e26231a0b9aac0