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

Change-Id: I527300ce4f4182c278a2e065f2e5a3c322c79433