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

Change-Id: I325c4da2f9a6605f7c9edb4b95d5f12770849e14