Merge "surfaceflinger: grant access to vr_manager_service"