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

Change-Id: I0f2e831b4948cf854dbefe590879356c25131633