Merge "Add SCREEN_BRIGHTNESS_FOR_VR to set of public settings." into pi-dev am: 7830cd820b
am: 9cb0a9f1aa

Change-Id: If36f69de41e1caaaf6ec5adf47cca7b4935b222e