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

Change-Id: I7d17f24018e646e96ce74bbd826345bea7b5560d