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

Change-Id: Idcf0447ec99e148b865c2f8fe25c614bc149aa32