DO NOT MERGE Revert "Add Brightness setting for VR Mode." am: 966045d070
am: 7e5cff0167  -s ours

Change-Id: Id97065997a9e4d296c7b86fb910fc0b86e2feef4